Merge version 12.5.0-6+rpi1 and 12.5.0-7 to produce 12.5.0-7+rpi1

diff --cc debian/changelog
index 5a6adbb9b6e964748666f4a75c815f43eb4ec835,a6a458ad64bccdbff57938aeb9b55f4451259211..afe2b4bfc8c949f1fa89b66c87c612eaf2d020c4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- gcc-12 (12.5.0-6+rpi1) forky-staging; urgency=medium
++gcc-12 (12.5.0-7+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from gcc-8 8-20180207-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 17 Feb 2018 00:20:23 +0000]
 +  * Don't pass -march=armv7+fp to compiler when building libatomic.
 +
 +  [changes introduced in gcc-8 8.2.0-16+rpi1 by Peter Michael Green]
 +  * Disable testsuite (build seems to hang after testsuite completes).
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Jan 2026 12:44:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Feb 2026 21:19:24 +0000
++
+ gcc-12 (12.5.0-7) unstable; urgency=medium
+ 
+   * Add architectureVariant to ELF_PACKAGE_METADATA.
+   * Stop building multilibs for s390x. Closes: #1125355.
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 19 Jan 2026 16:43:48 +0100
  
  gcc-12 (12.5.0-6) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge